fix(discovery): check quota before upload (during discovery) by solracsf · Pull Request #9777 · nextcloud/desktop

solracsf · 2026-04-02T13:49:23Z

Fixes #4580 (more an enhancement of actual behavior)

Related to nextcloud/server#51977
Related to nextcloud/server#59398

Quota is now checked during discovery, before any data is transmitted. If a file exceeds available quota it receives a DetailError immediately, with no retry scheduled. A _quotaBytesReserved counter prevents multiple files from being approved when their combined size exceeds quota.

The propagator's pre-upload guard is also improved: it now walks the folder hierarchy to find the nearest quota entry, and the propagator is seeded with PROPFIND quota data at the start of each cycle. Combined with nextcloud/server#59398 and nextcloud/groupfolders#4539 this makes this behavior almost full proof.

4 new tests cover: single file blocked, unknown quota allowed, chunked upload blocked, and two files exceeding combined quota.

solracsf · 2026-04-03T06:09:14Z

solar-scanner missing is out of scope of this PR
(#9786 should fix it)

mgallien · 2026-04-03T08:35:12Z

solar-scanner missing is out of scope of this PR (#9786 should fix it)

sorry for the mess
my bad

github-actions · 2026-04-03T10:30:21Z

Artifact containing the AppImage: nextcloud-appimage-pr-9777.zip

Digest: sha256:827461c2f2400b34459144223dd6997c57b2811085bc67b6f13ab742cc53fe5f

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

sonarqubecloud · 2026-04-03T12:29:36Z

Quality Gate failed

Failed conditions
D Maintainability Rating on New Code (required ≥ A)
E Reliability Rating on New Code (required ≥ A)
104 New Code Smells (required ≤ 0)
1 New Bugs (required ≤ 0)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

solracsf · 2026-04-03T12:38:09Z

Every remaining SonarCloud issues are pre-existing code that SonarQube is classifying as "new" because our modifications shifted line numbers of otherwise untouched code into its diff window.

The Quality Gate cannot be cleared by fixing code in this PR.

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

camilasan · 2026-07-27T13:45:45Z

 void SyncEngine::slotInsufficientRemoteStorage()
 {
-    auto msg = tr("There is insufficient space available on the server for some uploads.");
+    auto msg = tr("Upload paused: one or more files exceed your remaining Nextcloud storage quota. "


Suggested change

auto msg = tr("Upload paused: one or more files exceed your remaining Nextcloud storage quota. "

const auto msg = tr("Current files upload size exceeds your remaining storage quota."

camilasan · 2026-07-27T13:48:48Z

 {
-    auto msg = tr("There is insufficient space available on the server for some uploads.");
+    auto msg = tr("Upload paused: one or more files exceed your remaining Nextcloud storage quota. "
+                  "Free up server space or contact your administrator to increase your quota.");


Suggested change

"Free up server space or contact your administrator to increase your quota.");

"Free up server space or contact your administrator to increase your user quota.");

camilasan · 2026-07-27T13:50:14Z

        emit propagator()->insufficientRemoteStorage();
-        done(SyncFileItem::DetailError, tr("Upload of %1 exceeds the quota for the folder").arg(Utility::octetsToString(_fileToUpload._size)));
+        done(SyncFileItem::DetailError,
+             tr("Upload of %1 exceeds %2 of remaining storage quota for this folder")


Suggested change

tr("Upload of %1 exceeds %2 of remaining storage quota for this folder")

tr("Upload of %1 exceeds %2 of remaining storage quota for this folder.")

camilasan · 2026-07-27T13:50:45Z

        QCOMPARE(recordFolderA._folderQuota.bytesAvailable, 500);

-        // add fileNameA to folderA - size < quota in db
+        // ── Case 1: upload succeeds when size < fresh PROPFIND quota ──


Suggested change

// ── Case 1: upload succeeds when size < fresh PROPFIND quota ──

// Case 1: upload succeeds when size < fresh PROPFIND quota

camilasan · 2026-07-27T13:51:17Z

-        // add smallFile to folderA - size < quota in db
-        const QString smallFile("A/smallFile.data");
-        fakeFolder.localModifier().insert(smallFile, 100);
+        // ── Case 2: fresh PROPFIND value (0) wins over stale DB (500) ──


Suggested change

// ── Case 2: fresh PROPFIND value (0) wins over stale DB (500) ──

// Case 2: fresh PROPFIND value (0) wins over stale DB (500)

camilasan · 2026-07-27T13:51:46Z

+        QCOMPARE(syncSpy.findItem(fileBlocked)->_status, SyncFileItem::Status::DetailError);

-        // create remoteFileA - size > bytes available
+        // ── Case 3: downloads are not affected by upload quota ──


Suggested change

// ── Case 3: downloads are not affected by upload quota ──

// Case 3: downloads are not affected by upload quota

camilasan · 2026-07-27T13:52:00Z

-        fakeFolder.localModifier().insert(fileNameB, 0);
-
-        // set different quota for folderA - remote change does not change etag yet
+        // ── Case 4: after quota increase, previously blocked file uploads ──


Suggested change

// ── Case 4: after quota increase, previously blocked file uploads ──

// Case 4: after quota increase, previously blocked file uploads

camilasan · 2026-07-27T13:52:15Z

+        QCOMPARE(syncSpy.findItem(fileNameD)->_status, SyncFileItem::Status::DetailError);

-        // create local fileNameE - size < quota in db
+        // ── Case 6: file within quota succeeds even while another is blocked ──


Suggested change

// ── Case 6: file within quota succeeds even while another is blocked ──

// Case 6: file within quota succeeds even while another is blocked

camilasan · 2026-07-27T14:03:32Z

This really needs to be tested with nextcloud/server#59398 merged.

sonarqubecloud · 2026-07-27T14:57:01Z

Quality Gate failed

Failed conditions
D Maintainability Rating on New Code (required ≥ A)
105 New Code Smells (required ≤ 0)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

solracsf force-pushed the checkQuotaBeforeUpload branch from 114c6ee to 1f866cb Compare April 2, 2026 13:56

solracsf added the 2. developing label Apr 2, 2026

solracsf changed the title ~~fix(discovery): check quota before upload~~ fix(discovery): check quota before upload (during discovery) Apr 2, 2026

solracsf force-pushed the checkQuotaBeforeUpload branch 3 times, most recently from 091d2a9 to 399b158 Compare April 3, 2026 05:42

solracsf added feature: 🔄 sync engine 3. to review and removed 2. developing labels Apr 3, 2026

solracsf marked this pull request as ready for review April 3, 2026 06:08

solracsf requested review from Aiiaiiio, camilasan, i2h3, mgallien and nilsding as code owners April 3, 2026 06:08

mgallien force-pushed the checkQuotaBeforeUpload branch from 399b158 to e425898 Compare April 3, 2026 08:35

solracsf force-pushed the checkQuotaBeforeUpload branch from e425898 to dcb2b54 Compare April 3, 2026 09:24

solracsf added 2 commits July 27, 2026 14:56

fix(discovery): check quota before upload (during discovery)

baa55b7

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

fix: SonarCloud issues

ef71e47

camilasan force-pushed the checkQuotaBeforeUpload branch from c72a6c3 to ef71e47 Compare July 27, 2026 12:56

camilasan requested a review from claucambra as a code owner July 27, 2026 12:56

camilasan requested changes Jul 27, 2026

View reviewed changes

camilasan self-assigned this Jul 27, 2026

	auto msg = tr("Upload paused: one or more files exceed your remaining Nextcloud storage quota. "
	const auto msg = tr("Current files upload size exceeds your remaining storage quota."

	"Free up server space or contact your administrator to increase your quota.");
	"Free up server space or contact your administrator to increase your user quota.");

	tr("Upload of %1 exceeds %2 of remaining storage quota for this folder")
	tr("Upload of %1 exceeds %2 of remaining storage quota for this folder.")

	// ── Case 1: upload succeeds when size < fresh PROPFIND quota ──
	// Case 1: upload succeeds when size < fresh PROPFIND quota

	// ── Case 2: fresh PROPFIND value (0) wins over stale DB (500) ──
	// Case 2: fresh PROPFIND value (0) wins over stale DB (500)

	// ── Case 3: downloads are not affected by upload quota ──
	// Case 3: downloads are not affected by upload quota

	// ── Case 4: after quota increase, previously blocked file uploads ──
	// Case 4: after quota increase, previously blocked file uploads

	// ── Case 6: file within quota succeeds even while another is blocked ──
	// Case 6: file within quota succeeds even while another is blocked

Uh oh!

Conversation

solracsf commented Apr 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

solracsf commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mgallien commented Apr 3, 2026

Uh oh!

github-actions Bot commented Apr 3, 2026

Uh oh!

sonarqubecloud Bot commented Apr 3, 2026

Quality Gate failed

Uh oh!

solracsf commented Apr 3, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

camilasan commented Jul 27, 2026

Uh oh!

sonarqubecloud Bot commented Jul 27, 2026

Quality Gate failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

solracsf commented Apr 2, 2026 •

edited

Loading

solracsf commented Apr 3, 2026 •

edited

Loading